Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Fri, 9 Mar 2007 11:14:03 +0000 (11:14 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Fri, 9 Mar 2007 11:14:03 +0000 (11:14 +0000)

Trivial merge